gtk-demo: Port builder example to resources

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index afdda22d21eda0985374e90c3c88bb524d354acf..7e23da63f28425e0e26b0ad561a129ae3eb668d3 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -79,7 +79,6 @@ BUILT_SOURCES = demos.h demo_resources.c
 
 EXTRA_DIST +=                          \
        $(IMAGEFILES)                   \
-       demo.ui                         \
        demo.gresource.xml              \
        $(RESOURCES)                    \
        org.gtk.Demo.gschema.xml
@@ -113,6 +112,7 @@ demo_resources.c: demo.gresource.xml $(RESOURCES)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml
 
 RESOURCES=     application.ui                  \
+               demo.ui                         \
                menus.ui                        \
                theming.ui                      \
                gtk-logo-24.png                 \

diff --git a/demos/gtk-demo/builder.c b/demos/gtk-demo/builder.c
index f0691af490c60eb1593e0e6788630577212f1a86..663fffd91e4c19f3e63f1f679426a0f758e134c5 100644 (file)
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -38,14 +38,11 @@ do_builder (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GError *err = NULL;
-  gchar *filename;
 
   if (!window)
     {
       builder = gtk_builder_new ();
-      filename = demo_find_file ("demo.ui", NULL);
-      gtk_builder_add_from_file (builder, filename, &err);
-      g_free (filename);
+      gtk_builder_add_from_resource (builder, "/builder/demo.ui", &err);
       if (err)
         {
           g_error ("ERROR: %s\n", err->message);

diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index ad24bb81a2f35c0d3c57b82f646901369fc6afdf..33c0962a626486b405349c6bf45c38d38b1eea26 100644 (file)
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -12,6 +12,9 @@
     <file>cssview.css</file>
     <file>reset.css</file>
   </gresource>
+  <gresource prefix="/builder">
+    <file>demo.ui</file>
+  </gresource>
   <gresource prefix="/css_accordion">
     <file alias="gtk.css">css_accordion.css</file>
   </gresource>